From: Jonas Dreßler <verdre@v0yd.nl>
Date: Wed, 4 Dec 2019 20:23:20 +0000 (+0100)
Subject: closeDialog: Fix scale of dialog for x11 clients in Wayland sessions
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~335
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=22cb0b002dd4eff04676c07b5e2ef35b4d5dc457;p=gnome-shell.git

closeDialog: Fix scale of dialog for x11 clients in Wayland sessions

We missed this case in b6e57a5ae8e3871161e2bdcc44e46af1cc56b2f7,
XWayland clients obviously don't use MetaWindowWayland and thus they
don't apply the double scaling that commit was meant to fix.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/884
---

diff --git a/js/ui/closeDialog.js b/js/ui/closeDialog.js
index 6ec5efefe..86d14059a 100644
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -47,11 +47,11 @@ var CloseDialog = GObject.registerClass({
     }
 
     _updateScale() {
-        // Since this is a child of MetaWindowActor (which, in Wayland sessions,
+        // Since this is a child of MetaWindowActor (which, for Wayland clients,
         // applies the geometry scale factor to its children itself, see
         // meta_window_actor_set_geometry_scale()), make sure we don't apply
         // the factor twice in the end.
-        if (!Meta.is_wayland_compositor())
+        if (this._window.get_client_type() !== Meta.WindowClientType.WAYLAND)
             return;
 
         let { scaleFactor } = St.ThemeContext.get_for_stage(global.stage);